minor enhancments