small fixes and removing some comments