some small changes
a merge fail because of ips...