Add wrapper script, adjustments, fixes