General Changes

changed a ton of stuff