Bugs etc pp
merge