switch from fig8 to overhand, minor cleanup, more clean up needed
minor clean