Fixed finishing phase, got rid of some debug msgs