public marks

PUBLIC MARKS from decembre with tags hacking & p2p