More debugging and prettification.