Redid command handling, added some commands