Fixed issues and removed debugging code