bunch of small stuff
merged