more incremental cleanup, reafactoring, issue fixing.