Env, enemy, small fixes