more hacks; compiles and links now