corrected a few issue