Small changes, removed test and debug code.