Fixed most of the commands