better property checking, and comment fixes