Fixed a few issues, and verified callbacks work as expected