misc updates, trying to pass first build