Minor tweaks... Still trying to figure out why we're getting bogged down...