more options improvements