Bug fixes in progress.