closer to fixing parsing bugs
finalizing parse command
finalizing parse command changes