better border
first draft done
got rid of swp