some clean up, and added some comparisons for proposals