added some comment stubs and some minor other fixes improvements