added more doc and properties