some more touches - still not right though