Further refined mapping, tweaking Python script

Switched to single integration of movement. Still unpredictable with
certain kinds of movements. Fixed minor issues with Python script.