Made some changes/fixed