fix async calls, complete points
fix wording to match with comes from db