Dealt with issues 31,32,34-37. Bug fixes and more clean-up.