Bug fixes and outstanding work