Removed debug, fixed names