Make logging clearer and fix dependencies slightly