Hopefully fixed some errors with the new commands