minor fixes while testing again