NEW: introduced partial discount model / tests
Implemented filter on membership constraint
Fixes and improvements