instructions added, comments and sysos removed
fixed conflicts