Minor option update, major execution update

See commit logs.