clean up and some fixes for older gnome shell versions
clean up and some fixes for older gnome shell versions