Commented some lines and added some fixes