fixed the definition of OVERRIDE with gcc.
fixed coding and styling issues.