made requested fixes