Sample file & other small changes