Ignore zip files.
More todos.
Fixed naming bug in interactive use. I really need to automate interactive testing.