Add version argument, small fixes.