Minor tweaks, message loop problems.