correcting some issues