Lots more litte changes