update spf13, minor fixes
fix cfw macro