Fixing groups and such, if you should be in this group let me know.

Mad222 and a few others added/fixed