Added ability to edit goals. Added more comments