add sample chunks, miscellaneous changes