Fix player bug; Rework Lightning?;