Another huge update

Facelift I hope.