A lot of fixes to reciter