Improved performance

Will add some more hashes later on, too lazy now, working on something
else...