New File and little Fixes