Several small changes for usability and cleaner code. Fixed comments.