Initial commit
minor modifications