Added options and some minor changes
Added options and some minor changes