fixed somehow corrupted file so tests can pass
new stage added
better log messages and missing resolutions in log