first commit
some config variables'
merged