Make parsing better and add some commands