Cleaning up stats parser.
Cleaned up last 'original' command -- rename.