Updates

Updates to framework and scripts.