update on save working, not tested great though
better tooltips