Fix for Errors

Using Dictionaries instead of Hashtables
Maya?