Changes from yesterday. Fixed comments from code cleanup, and fixed conflicts that arose.