Added documentation, updated properties