mostly bug fixes

also finished moving a couple ninja vars into newpixbot