modified a crapton of stuff