correct several issues