update to wp3.8, move a few things around