need to add link tooltop
more fixes for 0.13.0