Minor updates; removed testing code from main.cpp in an attempt to keep
repo clean