implemented some more commands + minor cleanings