Update

Fixed a few bugs