fixing messages. ditched modal tweaks, which didn't work