fixed a bug and commented out some code for testing