Add GCC_OPT to  and some minor cleanup