refactoring
fix multiplier shape
refactoring and fixes