Bug fixes, functionality added.