fix overflow on small BP and add angular-moment