New tooltip type and more options/fixes