snapping bugfixes