fixing travis errors, and formatting