Improving last commit.

This is still bugged but fixes a lot, need to find a fix for the problem
that itemstacks doesn't stack anymore.