fix borders
various tweaks