Incremental hash added everywhere in place of normal hashing, bugs fixed