Added fit surface and finished main edits from meeting