made private properties and fix minor things