compiles on linux, cleanups