some fix, ready to deploy