Added merge in AhoBuilder & some tiny fixes