response updates; cleaning code a bit
merging conflicts