Merge with Grischas File, correction of mistakes