cleared up the CPPFLAGS mess a little