some stuff that didn't get committed before apparently
unchanged background
fixed merge errors