Added more commands and reranaged some things