1. Fix some bugs
