Some Quick fixes
Added humanization to things