Bug fixes, style changes, added some properties.