ugh. lots of unneeded comments left in. better now.