Change Default to Flag and fix some other little things
Fix some warnings.