fix a few bugs
1.1.3