-Switched LCD display code back to old style to support *working* GLCD
-Demo code updates
-Some code optimization/clean up