some more changes, compiles