fixing orphans
slight tweaks