Error Fixes

Fixed minor errors and tweaked a few things for final turn in