initial
minor changes