Fixed dictionary, and added things