Implemented score calculation + some extra features