some changes, corrections