Last fixes

The smallest fix: making sure the inventory is workable

I would rather have implemented something completely new! No time though. 10 min left! I CAN DO THIS!