Refactor of include code, removed the debug function(not useful) and reworked a little the demo site.