Things basically working after major rewrite of opt handling. Much cleanup still in order...