More options+bugfix