uncomments scanner note stuff
adds primitive decls
fixes java and contgeo merge