Really fleshed out the commands and fixed a lot of the kinks