Children are kids now + more stubs and fixes