Updates

Updates from further testing.