fix attributes and minor style related things