added borders and minor fixes