Made tank loading more robust and elegant.