Several bugs were fixed!