small fixes // cleanup
added popovers