further enhancments and fixes...