Update

Fixed most bugs