remove unwanted comments and fix some small bugs in project