Issue #2 and other formatting issues resolved.