* some fixes from HEAD
3 files changed