Filename capture improved
More messing about