more styling
merged with fixes