Fix KINDLING and SPARKS group handling, minor style changes