Updated some packets and cleanup