draw elements fixes/enhancements