Another shitload of additions and changes