Improve debugging and colours