fixing simple issues, spill-over unresolved