better documentation, fixes