example changes
way better debugging info, plus a spot of refactoring