minor corrections - removed some debug