Fixed

• Misc. fixes and performance improvements.