things got out of sync, maybe i should scratch this branch... resyncing a little