- ditched some macros for enums
- further refactoring
- without-feedback control works again!