- pieces alignment in cell
- other minor refactoring