fixed style and minor aesthetic patches.