Latest Update

Fixed bugs