Touch ups; Modal fixes.