2 more sections

and some fixes