Added default properties.
Minor fixes in naming.