porkos, refactor of inventory, bjorn fixes, misc fixes