All default options specified at input
Removed static on local/temporary variables
More unstatic-ing
Checked included files in headers