tooltip and some other improvements