moved waitUntil
added Application
fixed getParent. Thanks to idea, for also renaming ..