updated a heap of stuff