Fixing bugs with put and remove, plus other stuff. :dart: