Candidate for next release
minor tweaks