Made some miscellaneous improvements. More maintenance to come this week.