*sigh*
spent a lot of time and got little done.
it's 11:30 pst and I hope i can get returns working before deadline.
last push before return fixes (hopefully)