public marks

PUBLIC MARKS from julien.c with tags temps & add-on