Added new comments and other stuff