fixes and deploy