Fixes and stuff. Finished more of the actual redesign, still work to do.