minor changes before adam remerge