Timo

a few small bug fixes and enhancements, see commit logs.