edited some trivial things in ...
merged some conflicts, ... you know the usual