typos and technical details
commit ahmed
merge files