Various fixes; more stable motion keys; removed wrapping; added workspace related find motions