Fix warnings, merge, and check my code in