changes to borders and bug subtasks