- added border add/remove handling
- code cleanup