Fixed bug from updating fit_portrait; fixed id bug; fixed first_guess
Pennucci git merge failure and fix...