Fixed all dictionary errors (I think)