minor changes. removed debug