added some things to properties, minor changes