More cleaning up, and more features (rename, etc)