added score goal setting, simplified victory code