It Works

Across the board fixes so that everything works (as far as I know)