Minor changes, swiping works now