added basic support for return values... this is getting ugly
merged conflicting bison versions