several improvements and a fix from Mike. THX