better badges, other improvements