Fixed All the errors