fix bugs. comment out some code