Update and fix bugs

Update and fix bugs