Fixed errors and modified contents