Added parent to plugin manager as well as some cleanup