Initial amenthes cosmetic changes

Fixes #1