Achim for various suggestions

Achim for various suggestions