bug fixes + screenshot