content stuff
a few fixes