Main headers installation fixed
Access level for base image constructor fixed
Minor style improvements