admin bar, small amendments/fixes