initial pull and minor changes