various fixes, following product development in production