SOme Small stuff changed