a lot of fixes to deploy