Some more progress; Also some housecleaning