various improvements, about to deploy for the first time