more long changes
progressively getting the compiler satisfied