updated docs and other little problems
merged files