added dot/cross, and more