Haloween Update

changes in the commits, last commit is for 3.3.3, everything else is 3.3.2