Added tags and modified layer collisions for player and stick