Finally updated everything. I can collapse in a heap now.