Add some problems, fix some formatting