final changes
removed comments and debug messages