ahaa..., at last..., bugs fixed