More improvements. Delete hashtable thing when we're done with it.