authentication enhancement and some other issues