Some small adjustments to graphics stuff, demo code.