make headers uniform, add todos