All around cleanup and improvements(?)