Update for version 0.29 (please review)

and fixed something I stumbled over.