Bug fixes & performance improvements.