Fixed a couple of bugs and updated to have working selection borders when other selections are disabled or not