tweaks and add other alternatives
move demo into demo directory
tweaks
change extension and add syntax goodness