Cleanup
- more tile life cycle event handling