Further tweaking

I swear I'm happy with these now