Dictionary update

Last dictionary fix for today, removed duplicates and added more
exceptions.