Some minor fixes, and fiddling with level 3