options form + fixes