recolored and some small fixes