some issues corrected