+ fix other-modules
+ some math