Speed, accuracy improvements. Moved suggestion text storage to dicts