modal fixes, etc