fix wrapper, minor UI fix