fucking swap
fucking swap
cleanup, locks, odb fix