Clean up and add a few commands