Bug fixes and extra work.