Fix bug errors

Need to debug the errors on the code