got things a bit closer to right, but there is still a nasty problem on