Some updates

Fixed some minor issues