Fixed minor bugs. Cleaned up clean and dump commands.