changed border and cleaned up some comments