fixed things (like getByToken and other comments)