Formatted some stuff in a table, added user and channel source