Minor changes to source.cpp