Many bug fixes #deploy