Fixed some bugs and performance improvements