Fixes

-Type based changes
-Fixed units in some cases