Added swyping, small fixes