some little fixes / enhancements while testing