fixed stuff
sorry guys, fixed the issue.
Merge branch 'other-options'