a few more stubs and some cleanup