More math, marker tweaks