More packet cleanup

-Converted more constants over to the new system