clearing cruft and odd fixes