various improvements
image