added back all the LOC_ changes and ...

a handful of other stuff