improvements to scurveMaps
working trim test
merged conflicts