Updates (2)

Update new features and fix bugs