first commit
minor adjustments