Initial commit
misc changes