add gluten message
various bug fixes