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