Trying to fix errors, added new commands