cleanups
working on compiler