Hey Cosmos,
Thanks so much for confirming the fix!
In order to fix the multiplayer I had to keep the controllers constant (1st player will always be first, etc) but I can switch the keyboard to any player. This is why if you join in with the keyboard first the controller will still work as player 1, but if you join in with the controller first then the keyboard can be reassigned to 2. I hope this is much of a problem.
Xbox 360 and One controllers should all be working and you can also mix and match different controllers so you can have 1 player on PS4, 1 with an Xbox 360 , 1 with a PS3 controller, 1 with a Logitech and they should all work together.
Thanks again,
Rafi