performance, fix bugs
fix bugs