Additions, bugfixes, etc.