more fixes / enhancements