fixed *all* the bugs, but still on the look out for more. this should be merge ready if the doc/release/proc engineers are still OK on it