Added version command as well as small cleanup

Cleaned up some of the output