Lots of updates


@bsneed