.
fixed a few documentation bugs
merged