added player2 and optimize/change some propreties
merge fix