Noted a change we need to make, fixed some command parsing issues.