fixes

On topic 1, 2 and 3