Updated readme, more code cleanup and tweaks to sorting auto-complete suggestions.