Improved arrow replacer

Replaced crazy lookup scheme from before with a hash table,
Added more arrows