Minor tweeks

Just minor changes that bothered me.