various enhancements

git-svn-id: https://scale-ability.fr/svn/github/Not-So-Original/trunk@1085 744bd327-0465-4c9b-be31-35d8739af2d3