Improve dictionary

- Remove string keys
- Add rest of numbers
Fix typos