remake swipe behaviour + added 'options' option + big refactor+ various bug fix