finished comments and removed debug messages