Clean up, fix list bounds and sample rate issues