better placement.
Adds some cleanup to gotopoint.
next steps. still marked as dirty after clean up.