Fixed access specifiers
Minor changes