added flags, working towards C mode, minor changes
stuff
tiny reformats