Some minor changes. Need to start profiling TONIGHT.