bit o' cleanup
more progress