Several argument fixes. Full readme