tons of styling
fixed merges
texts