Bug fix/improvements

fixed prng bug
updating/recreating location dictionaries