Minor changes

Changed visibility of many methods and fields