Some extra info and fixes.