Update for halloween stuff and basic changes