Rework of player and enemies