commented more and cleaned up some shit