Last commit before license and release, made show results more robust