messagin cleanup (WIP) + file utilities (WIP)