Made income type an int (rather than str)
Fixed chr values by converting them to ints.
Merged changes