corrections to solution & entity matching