Fix scripts, add defaults, manage options