fix bug and add authorship