Updated env/boat state to use vars over arrays