Don't transfer past max storage

Also slight bug fix on remove.