Fixed add and remove bugs, now they work seemingly flawlesly