Fixes and cleanups

- Fixed cell highlighting
- Reimplemented delayed selection
- General cleanups