small fixes
Reduced number based impls