some fixes
last rev