A few changes

Regarding the word -> int change: I checked with Erik and he confirmed that integer samples are signed.