public marks

PUBLIC MARKS from rrhobbs with tags locationlibrary & p3update