edited comments and debugs