Update

Bug fixes and improvements!