Bug fixes and final release