ss buy improvements. refactor. minor fixes.