try to catch the bug
code cleaning
tmp
fixing pps7
merge anton's work