tweak comments and $@