Cleanups, Added more misc commands.