WAHM | وهم: adds options and fix some bugs

adds options and fix some bugs