some more from dev1
merge