More debugging / wrap up