more changes
forgot to commit one file
cjd may and learn to english
more changes