Updated

Fixed some bugs