Fixed _parent references and several minor bugs
4 files changed