changed default to defaultValue to avoid compiler warning, fixed some comments