NewOption update #5 - bug fixes & improvements