fixed some bugs
Merge branch 'christian_testing' of github.com:fooWander/tui_swp_formula into christian_testing