Removed CommandParser for this version. Small editorial fixes.