#1

1. Cell limit
2. Bug fix