public stuff, some fixes