add manstein and cleanups