added stuff TODO. fixed a couple of more automake things