Added ItemRemove and tweaked a few module things, hopefully for the last time