3.6b review

A bunch of small fixes