better separation between stuff
more adjustments