Line borders and a couple of bugs