border fixes, cleanup