Fixes #37 and #38 -- and other typos.

Didn't change filenames with "costumer".