Remove debugging tracing and erroring, add some alpha watermarks