- refactored the commandparser a bit