Various updates, removing antigen dependency to speed things up