Updated acces modifiers
Finished upgradeLayer, additinal comments