Tweaked and rearranged a few options