update location of stuff
update sizes
update text
update
Merge remote-tracking branch 'origin/master' into obama