Add more useful dictionary and bug fixes