Updated a bunch

Remember, check the HashTable!!!