Fix various drawing issues and add debugging colours.