location additions to gather
fixed merge conflicts
readme updates