undo more
+2
more
simplify some sp stuff
add script
test run