Minor updates, removed badges when zero.