Added price averages and cleanup