fixed some documentation - things in the wrong place.
cleaned up / refactored a bit.