V1.1.1

Fix a few bugs