intermediate commit

numerous changes towards a cleaner item / entity system