Minor bug fixes and added a few properties.