corrected some placement