cleanup and fixes + add eg