More markup fixes, zero warnings now