Flick implementation and typo fix