Fixed tooltip and minor options issues