Polished the Group & Stage functions.

Adjusted the Group functions so the names, and functions, are more
logically.