Fixed a crapton of stuff