Various minor improvements implemented.