fixed the rest of the non entity related errors