oops, sorry, last commit was totally wrong, fixed now, with some new tweaks.