matthewg
committed
on 26 Jun 06
fixing minor bugs and naming conflicts