updates and fixes towards release