Modified water z-index
Added log and tool to entitypool and removed hardcoding