Double border fix - update

Also fixed some other bugs