Switched to long command names, reorganized, commented.