cleaned up some pointer/reference things
fixed bug with stop heading values