small fix for xmas packet and less magic numbers