fix figure locations
rettelser af soeren
merge conf. fix