Good/Bad button operational, slight clean-ups