Fixed help and further refactor commands into noddy