Changed msg IDs and general cleanup