lots of small improvements, ad summer-research layout