Update

Fixed a few issues