minor fixes and reconfigurations