Updated setup part to be clearer.
Minor fixes, together with earlier commits this closes #1.