some tweaks/finishing