random fixes
styling
merging
typo