Improvments

Options options options