Made alterations to two files to hopefully make troubleshooting #42
easier