Many fixes / additions.