renamed arch specific functions
more cleanups