Fix packet issues and commit current work