whoops - don't include the bytecode generator yet
misc cleanup
testing