CLEANUP: minor troubles
more authors