Bugfixes, nei fixes, deletion of deprecated stuff, etc.