DEBUG: Minor bufixes, some documentation.