Issue #193: Small fixes and documentation.
Issue #118: Small fixes identified by Netbeans.