Finished off the commands, removed some debug commands. Closes #21