Fixed a few issues and removed debugger.