Huge update with a shitload of stuff added / fixed / broken.