some more fixes and sample update before release