Fixed more bugs
Fixed more bugs

aditiiyer/CERR,cerr/CERR,aditiiyer/CERR,aditiiyer/CERR,cerr/CERR,aditiiyer/CERR,aditiiyer/CERR,cerr/CERR,cerr/CERR,cerr/CERR,cerr/CERR,aditiiyer/CERR,aditiiyer/CERR,cerr/CERR,cerr/CERR,aditiiyer/CERR,cerr/CERR