Feature/new stuff

a long list of changes from the last 1 1/2 Months