upeate for today 2013 12 5, worked on UPF1 figures / notebook refactoring