Made the texture display work, cleanup of code, removed unused demo code.