Update #1

Fixed a few issues.