Small changes, added properties.