Changed the comments style, fixed a minor bug