FR corrections and additions.

Cut down lengthy entries and added missing ones.
http://i.gyazo.com/c93f51febb7673a396222166bb9e9fb8.png