sync with eth repo + minor fix
del arch file