Slight alterations in the group storage system (might fix bugs)

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>