extra checks to make sure connection is still good
some cleanup
Merge branch 'master' of https://github.com/ddm-victor/DrexelCs500P1
everything ready for the submit