cleaned code, fixed dropped goals bug.