most demos now working. modules fixed