refactoring, blinds pay action handling, tests...