Minor cosmetics + categories added

Quite similar to previous commit

Signed-off-by: JB Touchard <jbt@txtnet.com>