Rearrange options
Add diagnostic messages