add more advanced options and UI bug fixes