corrected some issues