wrap up other fixes before