Implemented changes and integrated ItemAction

Made changes to the rather horrible inventory system that I came up
with. Also made minor changes and bug fixes here and there.