Clean up; Fixed some broken commands.