fixed some doc blocks; removed some unused vars