added some overall tweaks