Bugg fixes in the main method

Fixed buggs in the main.cpp to match the new implementation agnostic
version of the additional methods.