Revised method and property names, added some doc for header files
Properties refactored