Minor changes and comments

Still needs refactoring