Dealt with issues 38,39. More bug fixes and clean up.