Merge fixes. Got player and enemy hands displaying.