All errors in the current implemented functions were fixed