Fix null instruments
Merge pull request #1136 from bootstraponline/fix_null_instruments

Fix null instruments
fix steps and duration logic for swipe and flick