some Fixes -> Finish for today