constructor fixes + headers in files