Fixed minor issues, final badge issuing completed