Lots of formatting issues resolved.