BUg fixed and remove some debugs