exposed a weird bug, patched a few issues...