Tiny pieces cleaned up, missing semicolons and friends