assorted bug fixes and eol cleanup