Fixed most of the commands... again