Some improvement on loc. anal.

Need work...