Bunch o fixes

This merges,  combines, and resolves conflicts from #211 #218 #236 #237 #238 #239 #240 #241 #242 #243 #244