3-7 some fixes