some overall tweaks