changed transition colour, and fixed a bug