Small fixes, OSX compatibility, small 2 player test - working