fixing styling
merged
stuff