added dynamic entity load function & renamed things