no nulls, cleaner trims, added some texts to map