global selectors removed, cleanups and bugfix in selectors