Making final fixes
Adding answer id objects to contenders