fixes and update before sharing