Add scoring and bugs resolved