Add syntax highlights
Some cleanup and demos