Minor escaping niggles :-(