Addressed some idiocracies and added groups

Signed-off-by: Jonathan Gawrych <Jonathan.Gawrych@gmail.com>