more changes, now compiles in 6.5 min