Small changes

ToDo: Inputvalidation of changes