new option system, fix #7 #6 #5