hopefully final batch of changes -> down to 0 compilation errors