scalability bugs fixed