Update a few things

@deavmi seriously.