Another bugfix update with some performance improvements.