Fixed bugs and better performance.