Lots of smaller adjustments