some small changes and the right color?