More standard ignores
Rename some functions and improve the documentation