Hmm... Looks good

- Optimizations
- Add water block