Updated message functions + comments