Fix filename typo
Reorganize options and editing