styling and utils tweaks