cleared comments after some bug fixes