some fixes and style things.