several race/locking fixes, not working yet.
latest snafu
fix the swallow that was causing the deadlock that was causing me pain
and killing my unborn children. thanks @drbrain for being awesome as
usual.