Some final tweaks... it builds now!