Updated shitload of stuff