Minor imporvments + nice colors