A few modifications to scripts and examples