Add debugging messages
Update option flags to use hyphens
Up version
Update whitespace