cleaned up opts handling fixed frm pick remarks