Changed ints to unsigned, fixed some key names