Lots of updates and templates/demos