some work on badges (ACP) that I forgot to commit weeks ago