Tuesday commits, plus abit of un-pulled Monday commits

mgoi~!