ok, look at the other issues and i'll merge this and then try something....