Near-final changes to main.cpp