changed some comments; removed some stuff