Fixed command stuff

Fixed the arrangement of the statements and '{}' to make it not broken.
Added message for an invalid number for setup