More styling
merged conflicts
formatted some stuff