Minor material clean up
More material parameter/argument work