Dotting some Is crossing some Ts.
Ooops forgot some files before. And fixing issue #218.