Added support for saving the waived options + minor fixes