added more, mostly fiddling