Hires: Cleaned up, added function pointers to variants of routines.