fixing errors (and fuck you tdubourg)