Bug-fix:

 - Additional work for point mapping, but still incomplete