fix a few bugs
fix some bugs in 60-90