some progress on assignment 2 # 10, and a major batch miscellaneous commit