Testing one-hot encoding + fixing bugs ...