wcchin fixed some minor