Removed extra space.

Closes #14.
Small tweaks.

Closes #13 and closes #15.