Colours can now be added and some fixes.