Fixed self error, and dictionary iterating error