Lots of minor changes, removed face suggestions