bug fixes, bytecode stuff
whoops little fix
blah
Fixed merge conflict