minor fixups/additions