Fix my git novice mistakes and more cleanup.