Many visual tweaks and further intro work per #21