Shamarized output, minor fixes