Commits


fix conflict


various bug fixes


a few workarounds. acidtypes seems not to get global types.


bring them up-to-speed for current system.


acid files