handled all the errors. Ready to merge