overhaul

restructured and changed commands a little