improved parent lookup
general improvements