i fail at commiting. various bug fixes and commands