minor fixes + some data