tidy up demo and add mail chimp