Options

A few changes